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