[automerger skipped] Merge "Merge "Mark NetworkStack as updatable." into...

[automerger skipped] Merge "Merge "Mark NetworkStack as updatable." into rvc-dev am: 4fc16c37 am: 08c29589" into rvc-d1-dev-plus-aosp am: 4db787d2 -s ours am: a8afac61 -s ours

am skip reason: Change-Id If34230b65fea3d73da28db2d6ee8a499b108f3ae with SHA-1 66780a84 is in history

Change-Id: I436894788e38362084526d13f6dfa4b50955f8ad