Merge aosp/master into rvc-dev 2020-03-20

Bug: 151650800
Change-Id: I77d89c2e7a06d2b32db89e0cb5c97d65ad0dddbe