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