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