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