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