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