[automerger skipped] Merge "Merge "Remove dynamic unmetered when capabilities...

[automerger skipped] Merge "Merge "Remove dynamic unmetered when capabilities are static unmetered" am: e0b53e48" into stage-aosp-master am: 0c7149a8 -s ours am: ff26a5d2 -s ours

am skip reason: Change-Id I309f0a62d3b5173b38cc2253ca44482a37644d51 with SHA-1 3abdf575 is in history

Change-Id: I2c99999bf47b6a7deefe7a208dab4b7c4eaa6a43