Merge "Fix NPE, Add null check to mActivityManager" into pi-car-dev am: c2953de5a2 am: 4533e05889 am: 13ffe1daec
am: fae4063a87

Change-Id: I7463bc25bd68b763c5df267aad8defe59ecf261d