[automerger skipped] Merge changes from topic "am-82fe8a094f9c4039a91dee9c1c0ed2c6" into rvc-d1-dev-plus-aosp am: e88b83f2 -s ours
am skip reason: Change-Id I781513e385e1cf2a77d1d052c4a450a94978e242 with SHA-1 23d55192 is in history
Change-Id: I297444f2910ce989202c955dfcbc4ce524333166