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