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