tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent 69afb6b8619057f67750b61a1647127f0e832fca
parent 0869bbf43d141a654d7ae3b29dba01b34ab1e5fe
author Tony Wickham <twickham@google.com> 1584760371 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584760371 +0000

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

Change-Id: I2e92d3cacee2c3e2845e35401e60b6aee97ed41b