[automerger skipped] Merge changes from topic "am-8cc93791e1774e1aa9860aa0d4545306" into rvc-d1-dev-plus-aosp am: 4eabde4a -s ours
am skip reason: Change-Id Id2f1f06981a1c303a657d35b6010e1e1d29e245f with SHA-1 42a84786 is in history
Change-Id: I8e833c73e490a8f80eb3fe7fa7cdcb44e9faed37