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