Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp am: 2da7dfe179
am: 9b2a564764

Change-Id: I911341e54139d094f4ca0b0662e91c2b2482dfb2