Merge "Fix ADR half cycle ambiguity doc (frameworks/base)" into sc-dev