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

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



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