Merge "Fix The pop-up security lock will disappear after rotate" into...

Merge "Fix The pop-up security lock will disappear after rotate" into tm-qpr-dev am: f2b50de5 am: aebeb9f6

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



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