Merge "Provide link to android experimental flags API" am: 9876efdabe
am: a94479c120

Change-Id: I3867a98978c3a80f9188590e235a67683e76f3a3