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