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: 33556687 am: c490e8ec am: a6643cfb

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



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