Merge "Lazy bundle" am: 93b4b55ee7 am: 872f7a88e5 am: f7dbfb7afc am: 36ff1cdd0e

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

Change-Id: I4b92b6bc3df874248a18eb9f33f0548e703856b7