Merge "[automerger skipped] Merge "Merge Android R" am: cdb6b16dec -s ours am: 73e8629851 -s ours am: ff9fd7efc7 -s ours am: e07e372c02 -s ours" into rvc-qpr-dev-plus-aosp