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