Merge "Revert "Flip LOCK_ICON flag on for teamfood."" into udc-qpr-dev am: 4c1dfffe

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



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