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