Merge "[automerger skipped] 2020-08-14: merge master to rvc-dev am: 5fcd8997c2 am: 58f48dceec am: c0eba51500 -s ours" into rvc-qpr-dev-plus-aosp