[automerger skipped] Merge "Extend splash screen exception list to SC-V2" am:...

[automerger skipped] Merge "Extend splash screen exception list to SC-V2" am: 36daf1f2 -s ours am: 46b81f21 -s ours

am skip reason: Merged-In I5412e81f70cbc9aac3861d13d85e199e949bedc7 with SHA-1 ba3d92d8 is already in history

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



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