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