[automerger skipped] Merge "Make non-updatable stubs depend on sdk 29" am: 477806b299 am: ffd485882f -s ours am: bd1b5c3370 -s ours
am skip reason: Change-Id I3c5e611ca45536bdd931291e663a21757e35992f with SHA-1 394febc71b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324166
Change-Id: I4c82678b6df508fd84763253680e9eac92c3f3e8
This commit is contained in: