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