Merge "Report ION usage event when ION heap size is 0" am: 7687adc00d am: d493ed705b am: da855f3363 am: 29711d8cba am: 2042c9c32a

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

Change-Id: I6cd8918f799160020d3f9b0577671dc3632d386e