Merge "Add support for /product-services partition." into stage-aosp-master am: d99a836380
am: 351d1f3f93

Change-Id: Iadd6368eb69f869ed72343d0d722311fe25161f6