Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: I4fc3c95c5a0061f171b3c7f972b5c44ffb8cbe19
BUG: 129345239
tree: 46e04db69c291ff2641384ae036feb09577df0a9
  1. devicetree/
  2. net/
  3. Android.bp