Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61' * commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61': move event log tags used by ActivityManager into this package
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61' * commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61': move event log tags used by ActivityManager into this package