Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8 am: 0bb64f1b" into nyc-dev-plus-aosp