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