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