Add missing alarm options to the documentation

Partial-Bug: 1380533
Change-Id: I9b6242bc19e299951a62c15cf3a3c9f35857a8c4
Clarify deprecation comment to be accurate

The planned change in functionality was delayed until Juno,
the original comment was written in IceHouse. There needs to be
a period of two cycles for deprecation.

N.B: No functional change in this patch, just change of comment.

Change-Id: I3f452fbda59358fe85c1d7060a4abebd2f7c311a
Avoid clobbering existing class definition

Using the same variable name for a new class implies that an
existing class is being modified whereas what's happening is that a
subclass is being created of an existing class and having a
different value for an attribute. Such an implication is confusing
for maintainability.

Change-Id: If784949e8b5706e881bc702ff0b30848bca17d5c
Merge "Add missing alarm options to the documentation"
Merge "Avoid clobbering existing class definition"
Merge "Clarify deprecation comment to be accurate"