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