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

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



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