[automerger skipped] Merge "Make non-updatable stubs depend on sdk 29" am:...

[automerger skipped] Merge "Make non-updatable stubs depend on sdk 29" am: 477806b2 am: ffd48588 -s ours am: bd1b5c33 -s ours am: 23a2178e -s ours

am skip reason: Change-Id I3c5e611ca45536bdd931291e663a21757e35992f with SHA-1 394febc7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324166

Change-Id: Ic9667bbaba088a187910850da82f72c0d29d0bf4