Merge "[automerger skipped] Merge "Add feature flag for Dynamic Android" am: c1e55147c9 am: 3e51385d47 am: dbfc7f4ef2 -s ours am skip reason: change_id I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd with SHA1 8cbedf5647 is in history"