Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945 Change-Id: I01556c0442565babb72c2f879f109ee8e12ba277 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>