Merge "Fix a bug where small manifest isn't read" am: 62582263a2 am: 6750cd8b02

Original change: https://android-review.googlesource.com/c/platform/development/+/1792911

Change-Id: If724cf9d9bad6143f0534b5cf5512b5b9f5a23be