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