Merge changes from topic "vintf_matrix_sepolicy"
am: 058d6c2d1e

Change-Id: I80eebbbd9b5339f4b3b622b5e932462f167505ac