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