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