Merge "Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev am: 5345fce58f" into oc-dr1-dev-plus-aosp