[automerger skipped] Merge "Extend splash screen exception list to SC-V2" am: 36daf1f2a1 -s ours am: 46b81f219b -s ours am: c0fa75ea2e -s ours am: e56fbb7a36 -s ours am: 24c44c502b -s ours

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

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

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