Merge changes from topic "savedstate_prebuilt"

* changes:
  Import AndroidX from build 5148736
  Add SavedState to update_prebuilts.py