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