Merge "Add measurement for dex size." am: bdcda2cb05 am: a3e895e610

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

Change-Id: I914acb7986ce684ee722e43470508866c365236b