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