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