[automerger skipped] Merge changes from topic "am-46ca6038f66d49b4807b268dd241ea1f" into rvc-d1-dev-plus-aosp am: f1a6a570 -s ours am: f8a1eed0 -s ours
am skip reason: Change-Id I1f279fadd8c543b845fce0f13dc62c1480757692 with SHA-1 c058cac0 is in history

Change-Id: I55a76b43bb7d21d72faa01c06a730b3ae2529b6c