[automerger skipped] Merge changes from topic "am-0d2c5b14221f458989d046cc3fe01738" into rvc-d1-dev-plus-aosp am: e3146794 -s ours
am skip reason: Change-Id I0e4fe4da5b56375589ef4b617819bfaae8abcf33 with SHA-1 d1d734f1 is in history
Change-Id: I5e92a845187aedbe8e8db19e5b3148db77935c33