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