Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0 am: ba16911723" into oc-dr1-dev-plus-aosp