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

Change-Id: I9669efab2fe272eb546fcf093779bab72484f0d5