Merge "If we ever rescan a stub, make sure to uncompress it" into sc-dev am: 5f28ee3e am: 4b07f33d

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

Change-Id: I623762682b9293245777040eeac4e3a1c2f94541