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

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

Change-Id: I30fa5befab82f758f2d7302800c4b3bc18bc7869