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