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: e1f53847 am: efbcbf10

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



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