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

Change-Id: I009e5fcc2e6ec0508d492657ea1861f83070a0c8