[automerger skipped] Merge "Update the current API dump" am: c2116d2c am:...
[automerger skipped] Merge "Update the current API dump" am: c2116d2c am: 6cd8c8e2 -s ours am: efaeb43e -s ours
am skip reason: Change-Id Idb1c34df81674321911e4a85f9e862b539a3f30c with SHA-1 e88dca8d is in history
Change-Id: I7b6ec80e6d9d782232b45f2c8035aedd35aa4f3c