[automerger skipped] Merge changes from topic "am-151d60af73e74c8e865b9ad7fc65e53a" into rvc-d1-dev-plus-aosp am: de3bfbffc2 -s ours am: 2f5e89c366 -s ours

am skip reason: Change-Id Ie1ba9b4d3ae1b41c1fbddb0b56faf51f8ef9d0dc with SHA-1 0e3218de6f is in history

Change-Id: I8c38028b2a4136f2c56d0d56db57799f1259f860