[automerger skipped] Merge "CTS test for ClassLoader AppComponentFactory" am: 7dfd5ddf6e am: fbe0203fa3
am: 3036e4676b  -s ours

Change-Id: I89dc060066bf77600e1e538b0ab0a20812be91e7