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