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