Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev...

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d am: a4c9bbef am: 3fca892d  -s ours am: 1d053b3b  -s ours am: af97c880 am: 8074c533 am: 2f0228c1  -s ours am: 29e4cd66 am: 7fd31ca0 am: badb5f2a am: 1c2e8848  -s ours am: fba31870 am: f6ce0bfd
am: f0dfef35  -s ours

Change-Id: I9e3f59f0c8f57ccb788e7db2715623742deb8138