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