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