Merge "Add system stubs as "provided" from vendor default" am: 1b926b2cc0

Change-Id: I1e1ce47f7c08f8411733cc117e0d495d0d15de20