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