Merge "Lazy bundle" am: 93b4b55ee7 am: 872f7a88e5

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

Change-Id: If624941e8a84c8ec9bc1fa98fe0f3e27a5b0f03c