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

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

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

Change-Id: I15f6fbbf666b7e72ff7d6975ed9f4dd46553d930