Merge "Add an API hint for metered multipath traffic." am: 7a12f7efc7
am: 0ad718aab1

Change-Id: I787a9722c210632539a9258e8320f88153daba55