Merge "Release MIGRATE_LOCK_ICON flag." into udc-qpr-dev am: d101028b47 am: e0b285984e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24151945

Change-Id: I701d5413b21541ddcbac80f9bda28efd9a88afae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>