[automerger skipped] Merge changes from topic "am-2449b47e70444356a2335610b7a17b50" into rvc-qpr-dev-plus-aosp am: b67a45f1 -s ours
am skip reason: Change-Id Iba48c173bdea2d55d8f2aa7f0fa382628582fe1c with SHA-1 5c8a5051 is in history
Change-Id: Ibac37bb6f044b3aa5f68a793bf7e1ea9498b2cc3