[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: fc9fde65e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8de024b7d344f83ccd2939ba7aa0aeeee3395ca9
tree: f6f7ea3e699c4faf324fa132f8e3d8aaa79e8508
  1. devicetree/
  2. net/
  3. Android.bp