[automerger skipped] Merge "Revert "ApplicationLoaders: hard failures &...
[automerger skipped] Merge "Revert "ApplicationLoaders: hard failures & tests"" into qt-dev-plus-aosp
am: 9f256f61 -s ours
am skip reason: change_id I988fe46a7bb810d7c2379e0472404345fd51b685 with SHA1 21a862cc is in history
Change-Id: Ica410b57d54ba4d7494f4e389c02e86f12cdc31d