[automerger skipped] Merge changes from topic "am-ce3313c2b8da49d9b34e7d44a98b2d63" into rvc-qpr-dev-plus-aosp am: f7aca5a9 -s ours
am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 833f4f6f is in history
Change-Id: I682571a352b62ef242f4899586ba24ff1fc6f20a