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