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