tree b4a4187ad4f4e14cff184dbd08c8bcfcd35e5340
parent f8b8a17c3956997ba0b311d352c839c28cf05be5
parent 99ea7872376e0865e82ee42e28256657afce0d45
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580964139 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580964139 +0000

Merge remote-tracking branch 'aosp/upstream' into uppercase_properties am: f0e6d47072 am: 99ea787237

Change-Id: I298cd6a147965ce6829f746c8f9fde0c8ab9b532