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

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

Change-Id: Ia6a5dce84f4eb60ff328e9c101790871bfee2262