Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) Bug: 166295507 Merged-In: I3a6d30448b2248807a5edf579f72bb6ed885b75e Change-Id: I4e01fbf5d6fd342573625b6e3ad0c2a387432920