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