[automerger skipped] Merge "Add support for /product-services partition."

am: 18be1e2f7e  -s ours

Change-Id: I93bc4d81cd9d54fb312bd78490d04eee3dd85ad9
This commit is contained in:
Dario Freni 2018-07-27 10:37:17 -07:00 committed by android-build-merger
commit 61774b9eb0

Diff content is not available