Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
am: 7c34fa7e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109 Change-Id: Iaea3f01e542c3d2b17f013ba3028dd3de7a8b287
This commit is contained in: