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

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



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