Merge "Merge "Add some logging for buggy calls to AM" into oc-dev am: 54a3ce2d" into oc-dev-plus-aosp am: 104ff456 Change-Id: I0093816d37d20a1c2f512a206f6f5069fe12c33e