Merge "Lazy bundle" am: 93b4b55ee7

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

Change-Id: I36812425c05b2849d15082f5c73c52a81ad1b423