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