Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp
am: 9c6e51be17

Change-Id: I04c09e459990f39bed37f6fee0104e741a088a09