Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp