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