[automerger skipped] Merge changes from topic "am-547bd147c34741b8adb948edc35e1c4e" into rvc-qpr-dev-plus-aosp am: beb81e35 -s ours
am skip reason: Change-Id Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 with SHA-1 298239b5 is in history
Change-Id: I019250f24053e0dd2dddd50ac2637576f954fed4