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