tree adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b
parent 2ddbe4c8afcbcabe0366dcabdaab80b34c0e633f
parent 0869bbf43d141a654d7ae3b29dba01b34ab1e5fe
author Tony Wickham <twickham@google.com> 1584760406 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584760406 +0000

[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d

Change-Id: I05294a3b59df128859a84838c2a26b2bd12e679d