[automerger skipped] Merge changes from topic "am-71ed23cf300847bb990d45597df3b0fa" into rvc-qpr-dev-plus-aosp am: ce8b16be -s ours
am skip reason: Change-Id I9f0a440db092317a48f7ed10210c2adeae9705e6 with SHA-1 032ad163 is in history
Change-Id: I4deb82f0542eb80e57c2ee545e64b7ccda5e5241