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

Change-Id: I46846b894e332431cf793657cad4903bfadd418f