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

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

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



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