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