Merge "Frameworks: Annotate trivial @GuardedBy in services/ misc"