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