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