[automerger skipped] Merge changes from topic "code_sync_from_aosp" into rvc-dev am: 24466c4924 -s ours

am skip reason: Change-Id I2b567c4dc978d5246b9d3d1481d395c6ad6448d0 with SHA-1 1743401728 is in history

Change-Id: I6af98c44f3d34bfa2549554c622043b634d4b4da