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