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