Merge "Revert "Fix replacesLayer assertion to account for splashscreen layer"" into udc-dev am: d23967c6 am: d0de0cc5

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



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