tree 7e579463b7b8e6e34ecac0b4769b7d1ae120e923
parent f1b067c67106d70c17e84470975dc66e625ac8f8
parent 54543bb423f8d86fb87f357de12fb18089b26a58
author Daniel Colascione <dancol@google.com> 1574311664 -0800
committer android-build-merger <android-build-merger@google.com> 1574311664 -0800

Merge changes from topic "property-handle"
am: 54543bb423

Change-Id: Id1ebdeca53c8705ce3cfab8db2e25cfebaa7f8a3