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