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