Merge "Fix wrong set force translucent when devices locked" into tm-qpr-dev am: a2076c8b

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



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