Merge "Fix wrong set force translucent when devices locked" into tm-qpr-dev...

Merge "Fix wrong set force translucent when devices locked" into tm-qpr-dev am: a2076c8b am: 2dce465d am: 293cf3f7 am: e6ed8ecb

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



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