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