tree 6a0483f7d8616d75a926c05c1befde1247c3b199
parent e338fa2d9d3662a540c3ee07376c94accf2454a2
parent 831ddd860fd4b5de019143942e5ab1ed38fe998d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583509843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583509843 +0000

Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: 831ddd860f

Change-Id: Iec745f6b05722d68424c8346d046d9b1cbcbde77