[automerger skipped] Merge changes from topic "am-d525b43610a1451f9f2cd06abd3de60e" into rvc-d1-dev-plus-aosp am: d60b2276 -s ours
am skip reason: Change-Id I9f0a440db092317a48f7ed10210c2adeae9705e6 with SHA-1 032ad163 is in history
Change-Id: I95a39cb1c7c64ef42eac4b231e3210af66e4f174