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