[automerger skipped] Merge changes from topic "am-fbf760d15b9847d0a81afc48aec25dc1" into rvc-qpr-dev-plus-aosp am: 0e404f05 -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 292dff5f is in history
Change-Id: I5f59746f31bafee05eefbd8a6e9e68ccddb6ae90