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