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