[automerger skipped] Merge "Add use_app_image_startup_cache feature flag" am: b5a69ab764 am: b2f6041624
am: 9c3874add3 -s ours
am skip reason: change_id I27c0b9ea9533b2b6ad1ccd45f0fb9292c4cfca02 with SHA1 ced7e08129 is in history

Change-Id: I97052962d5d5e9777bb5c573161b04fbebec46f1