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