[automerger skipped] Fix build for jetpack update am: 1c0af48f8c
-s ours am: 1aca5ed787
-s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21407399
Change-Id: Ic22e8e4cc7b35bf679296ce0396aa76134618ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: