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