[automerger skipped] Merge changes from topic "am-8afcef02fb40430cb2d15df5ac59dec5" into rvc-qpr-dev-plus-aosp am: 9485a7a9 -s ours
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edc is in history
Change-Id: Icfb7e4bb934c42b5ad763cb4a7252820d4f91a81