Merge "Fix LockTaskModeTests failure" into tm-qpr-dev am: 847d0f53e7 am: e999e8d90b

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

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