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