Merge "App layer now stays visible with restart dialog" into udc-dev am: 81c0694a am: 33556687

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



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